From: Florian Müllner <fmuellner@gnome.org>
Date: Sat, 22 Jul 2017 09:47:20 +0000 (+0200)
Subject: workspace: Switch back to using the :has-pointer property
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~200
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=734511a9aeb3a0abb5625b444ce76b8c47ff320a;p=gnome-shell.git

workspace: Switch back to using the :has-pointer property

In case where a method- and property name overlap, using the method
is less unambiguous than I thought - mozjs52-based gjs will only see
the method, while mozjs38-based gjs will only see the property. We
are in luck though, and the real property name contains dashes that
allow us to refer to the property in a way that works for all gjs
versions.

https://bugzilla.gnome.org/show_bug.cgi?id=785090
---

diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index ff2618a51..440da587a 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -500,7 +500,7 @@ var WindowOverlay = new Lang.Class({
         this._hidden = false;
 
         this.title.show();
-        if (this._windowClone.actor.has_pointer())
+        if (this._windowClone.actor['has-pointer'])
             this._animateVisible();
     },
 
@@ -699,8 +699,8 @@ var WindowOverlay = new Lang.Class({
     _idleToggleCloseButton: function() {
         this._idleToggleCloseId = 0;
 
-        if (!this._windowClone.actor.has_pointer() &&
-            !this.closeButton.has_pointer())
+        if (!this._windowClone.actor['has-pointer'] &&
+            !this.closeButton['has-pointer'])
             this._animateInvisible();
 
         return GLib.SOURCE_REMOVE;